Refixed merge conflicts for GTK_WIDGET_MAPPED/GTK_WIDGET_VISIBLE

diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index a0217f08b7004e0c1ce59e286167ebf71685caa6..61f237bc44a42d99b5aaa76439992b5e60c87212 100644 (file)
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -478,7 +478,7 @@ gtk_box_size_allocate (GtkWidget     *widget,
               child = children->data;
               children = children->next;
 
-              if (GTK_WIDGET_VISIBLE (child->widget))
+              if (gtk_widget_get_visible (child->widget))
                 {
                   if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
                     gtk_extended_layout_get_width_for_height (GTK_EXTENDED_LAYOUT (child->widget),

diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index c076f9d0dd144b114d074a964dcc7fcea501d97b..c3f3b5b160c7378739cc9ed0a2085b4a08b806a1 100644 (file)
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -141,7 +141,7 @@ _gtk_socket_windowing_get_natural_size (GtkSocket *socket)
   priv->natural_width = 1;
   priv->natural_height = 1;
 
-  if (GTK_WIDGET_MAPPED (socket))
+  if (gtk_widget_get_mapped (GTK_WIDGET (socket)))
     {
       display = gdk_drawable_get_display (socket->plug_window);
       property = gdk_x11_get_xatom_by_name_for_display (display, "_GTK_NATURAL_SIZE");